gtkmain: Propagate GDK_GRAB_BROKEN events to/from current focus

Let keyboard/pointer paths handle their own events, and find the
current focus. The event will be propagated through instead of
being just emitted on the toplevel.

This makes it handled throughout all the gestures that want to
know about it.

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 5254756377429f1abb291633c31cb54981b49b15..b621ed4f40b785c7fdb9aa6d93abd302e5cd0da9 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1244,11 +1244,17 @@ rewrite_event_for_toplevel (GdkEvent *event)
 {
   GdkSurface *surface;
   GdkKeyEvent *key_event;
+  GdkEventType event_type;
 
   surface = gdk_event_get_surface (event);
   if (!surface->parent)
     return NULL;
 
+  event_type = gdk_event_get_event_type (event);
+  if (event_type != GDK_KEY_PRESS &&
+      event_type != GDK_KEY_RELEASE)
+    return NULL;
+
   while (surface->parent)
     surface = surface->parent;
 
@@ -1456,6 +1462,9 @@ is_pointing_event (GdkEvent *event)
     case GDK_DROP_START:
       return TRUE;
 
+    case GDK_GRAB_BROKEN:
+      return gdk_device_get_source (gdk_event_get_device (event)) != GDK_SOURCE_KEYBOARD;
+
     default:
       return FALSE;
     }
@@ -1470,6 +1479,8 @@ is_key_event (GdkEvent *event)
     case GDK_KEY_RELEASE:
       return TRUE;
       break;
+    case GDK_GRAB_BROKEN:
+      return gdk_device_get_source (gdk_event_get_device (event)) == GDK_SOURCE_KEYBOARD;
     default:
       return FALSE;
     }
@@ -1606,6 +1617,11 @@ handle_pointing_event (GdkEvent *event)
     case GDK_TOUCHPAD_PINCH:
     case GDK_TOUCHPAD_SWIPE:
       break;
+    case GDK_GRAB_BROKEN:
+      target = gtk_window_lookup_effective_pointer_focus_widget (toplevel,
+                                                                 device,
+                                                                 sequence);
+      break;
     default:
       g_assert_not_reached ();
     }
@@ -1724,7 +1740,6 @@ gtk_main_do_event (GdkEvent *event)
       break;
 
     case GDK_FOCUS_CHANGE:
-    case GDK_GRAB_BROKEN:
       if (!_gtk_widget_captured_event (target_widget, event, target_widget))
         gtk_widget_event (target_widget, event, target_widget);
       break;
@@ -1748,6 +1763,7 @@ gtk_main_do_event (GdkEvent *event)
     case GDK_PAD_RING:
     case GDK_PAD_STRIP:
     case GDK_PAD_GROUP_MODE:
+    case GDK_GRAB_BROKEN:
       gtk_propagate_event (grab_widget, event);
       break;